*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9fe14112305c2faca616457e3b0f9fa03488d29d..81aa49995cb04ae6167b6287ce2f622cf6ec0105 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2005-12-11  Luc Teirlinck  <teirllm@auburn.edu>
+
+       * cus-edit.el (customize-apropos): Avoid listing an option more
+       than once under different aliases.  No longer list user options
+       that are not defined with defcustom (unless a prefix arg is given).
+       Doc fix.
+       (customize-apropos-options): Doc fix.
+
 2005-12-11  Juri Linkov  <juri@jurta.org>
 
        * frame.el (set-background-color, set-foreground-color)